merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Wed, 11 Apr 2007 13:30:02 +0000 (07:30 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Wed, 11 Apr 2007 13:30:02 +0000 (07:30 -0600)

Trivial merge